[IA64] Rename RID maker HVM_PARAM_CALLBACK_IRQ_RID to IA64_CALLBACK_IRQ_RID

Signed-off-by: Tsunehisa Doi <Doi.Tsunehisa@jp.fujitsu.com>

diff --git a/unmodified_drivers/linux-2.6/platform-pci/platform-pci.c b/unmodified_drivers/linux-2.6/platform-pci/platform-pci.c
index b529ce1308cc537e1e9a0502b6fb0a68a9a3b92e..a1b7eafc4efdd421930d1086d9ef9245298b9458 100644 (file)
--- a/unmodified_drivers/linux-2.6/platform-pci/platform-pci.c
+++ b/unmodified_drivers/linux-2.6/platform-pci/platform-pci.c
@@ -192,7 +192,7 @@ static int get_callback_irq(struct pci_dev *pdev)
        rid = ((pdev->bus->number & 0xff) << 8) | pdev->devfn;
        printk(KERN_INFO DRV_NAME ":use Requester-ID(%04x) as callback irq\n",
               rid);
-       return rid | HVM_PARAM_CALLBACK_IRQ_RID;
+       return rid | IA64_CALLBACK_IRQ_RID;
 #else /* !__ia64__ */
        return pdev->irq;
 #endif

diff --git a/xen/arch/ia64/vmx/vmx_process.c b/xen/arch/ia64/vmx/vmx_process.c
index 1fce5524b5ead0eb3d3641f11b37fe0eb3ea1fae..f8ff340a780b40826301fa9717d4df860a00926b 100644 (file)
--- a/xen/arch/ia64/vmx/vmx_process.c
+++ b/xen/arch/ia64/vmx/vmx_process.c
@@ -212,7 +212,7 @@ void leave_hypervisor_tail(struct pt_regs *regs)
             if (callback_irq != 0 && local_events_need_delivery()) {
                 /* change level for para-device callback irq */
                 /* use level irq to send discrete event */
-                if (callback_irq & HVM_PARAM_CALLBACK_IRQ_RID) {
+                if (callback_irq & IA64_CALLBACK_IRQ_RID) {
                     /* case of using Requester-ID as callback irq */
                     /* RID: '<#bus(8)><#dev(5)><#func(3)>' */
                     int dev = (callback_irq >> 3) & 0x1f;

diff --git a/xen/include/public/arch-ia64.h b/xen/include/public/arch-ia64.h
index 8b74ba39ccf0b2c4ed6519621e08caa1da6a369e..2da8fba00a41a6125673dce63adefb45315a20fa 100644 (file)
--- a/xen/include/public/arch-ia64.h
+++ b/xen/include/public/arch-ia64.h
@@ -64,7 +64,7 @@ DEFINE_XEN_GUEST_HANDLE(xen_pfn_t);
 
 /* Arch specific callback irq definition */
 /* using Requester-ID(RID) as callback irq */
-#define HVM_PARAM_CALLBACK_IRQ_RID        (1 << 31)
+#define IA64_CALLBACK_IRQ_RID        (1 << 31)
 
 /* Maximum number of virtual CPUs in multi-processor guests. */
 /* WARNING: before changing this, check that shared_info fits on a page */